getting rid of old code