removed some useless functions