removed more useless things