Uncomment cleanup step