Revise for new PERMIT_*, remove junk.