Delete unnecessary functions and add a timer to handle state changes

Delete unnecessary functions and add a timer to handle state changes #923