ADEN-1318 More cleanup