Cleanup and using K 1.0.0-beta1