When removing, please actually remove. Not just comment out. No point in keeping these as comments.