fixing clean up