fixed clean up;