Add cleanup step back in