cleanup unused code/comments