removed unused code/comments