SQWRL query API clean up