Removed dead code/comments