Removed some old commented out stuff.