General API cleaning