Moved role constraints into model and removed edit deployment