Remove old moved code