APIGW-1010 Reformatting and deleting unused stuff