Removed some commented-out code and comments.