Merge "cleanup apigateway code"