[#81910464] cleanup, reorg