Added api_util, removed unused import