APIs cleanup