Cleanup &  no-dexterity-sites fix