API cleaning