Removed clean up step