Deleted a bunch of commented-out stuff

Also got rid of all warnings (except one)!