commented out some unneeded code