working on the cleanup process