Removed some commented out stuff.