Clean up client building and creds/meta parsing