Cleaned up some commented-out stuff