Rename some files, remove autogenerated ones from VC
Remove commented-out code