Updates for proper cleaning