Version bump, last code cleanups