Loosen up a bit toolbar permission checking
Removed unused imports