got rid of old legacy stuff