Remove factored-out code [MJ-755]