Granite: remove a couple unused things