Updated cleanup script, still has a couple issues
TODO