Added more clean up