remove the old code