commented out some code not needed