commented out some unnecessary code