Merge "Api cleanup." into klp-modular-dev