fix typo + restore some previous cleanup prior to merge update