Use permissions hash
Menu updated
Remove unused code