Cleanup, removing some commented-out code for clarity