Remove more commented code