Remove dead-code and use-less comments

Some necessary clean-up