Cleaned up a few commented-out lines