Commit missing changes from Grantlee removal