Cleared old commented out stuff