AXAWHAPI-89 removes unused code