removed and commented out some code