Remove the old code