HCOLL-167 cleaned up my API