Remove unused stuff
Simplify rules and avoid pwd_reset Diazo bug