Remove moved code