cpp: further model cleanup
cpp: removing _async.hpp, cleaning up models further