got rid of old code