Removed some old commented out code