(Re)move some obligatory code