removed some unused code/comments