Simplify output ; remove unwanted api calls