Remove unneeded types from grants
Update to reflect grant model changes