got rid of some commented-out things that we're not using to avoid confusion