Remove debug / commented code