Removed some extra files, removed commented-out code