get rid of old code