Cleaned up some commented-out parts