data changes + code removal