comment out more stuff that may be unneeded now