Cleaned up the files a bit by removing unused code.