Cleanup & Version bump