#40 Cleanup step