PACK-22: Even more clean up