Removing custom functions in models