removed uncommented stuff