Remove comments and unused code