Cleaning up and adding --force