cleared currently unused code/comments