Remove old code ready for #141