minor cleanup, and added rest-client-builder exclusion