Implemented proper clean