cleaned up commented out stuff