ceanup unnecessary api checks