Removed grants that had legacy function signatures so that code will compile without errors. Grants must be separate.