cleanup api calls and add new switch for pairs