Authorization model cleanup