Remove references to stuff outside of api