Reimplemented cleaning