- Removed some old commented out 2.x statements