Remove granted rights code that is unused for now, some stylistic fixes

Also, undo granted_right references that were accidentally included in last commit