got rid of old dispatch code