More removals for #32