Removed possible race condition with cleaning-related promises