Re-added manual clean-up phases