Added cleaning timer, refactored servant states