Removed outdated comments / commented code