Removed unused code/comments