Permission system, clean-up