remove now useless code + fix nofifyChange bug