Merge pull request #748 from nupplaphil/remove_global_functions