Cleanup
Update to use latest permissions system