Pass filepath in global case, remove unneeded logging