Removed unnecessary function pointers.