removed some useless func