commented out more unneeded code