Cleaned up some distracting commented-out code