Committing my speed improvements to the cleanup script that we shouldn't need anylonger