UI related permission checking
Cleanup