remove safenet, support count for water