[#64680394] misc clean up