Added proper cleaning