[michael] Cleanups are refactored