[#61376720] cleaning out loads of commented code