Implemented clean up