Cleaned up commented out stuff