apigw-696 Small cleanup