More cleanup
Version bump