Get rid of unused set working and watched account validators