Cleanup some code.
Bump version.