got rid of some other delegate implementations