Remove: Unused data files
Update: Added public check

If the method is not public the code will fall back to the default
method.