Code Cleaning

Clean unneeded code/comments