Removed dependencies, reordered permissions