Remove moved feature code