Change delegate names and remove unneeded delegate