solidifying the cleanup