remove ugly api call bits