removed some useless things