Merge pull request #764 from jmaas/master

Remove func_utils as it wasn't being used anyway.