some ongoing demongolization of code