Cleanup

Version bump, plus remove some commented-out code until #4 is fixed.