Clean up a couple unnecessary files and vars