Remove nasty owner perms expansion in favour of bitmasks