Cleaning of unused code & comments.