remove old codes, make less observation