AXAWHAPI-32 Removes unused code