removed uncommented/unused code