APIGW-621 Tidying up some stuff