- Remove unused include - Remove roles that don't make sense
There's still some stuff that could potentially go elsewhere but I think it's enough for now.