correct previous commit and remove the actual removal from cleanup