cleanup
changed the way direct api is included