Removed some useless functions