added cleaner service waits and cleaned up action lines