Version bump and cleanup