Cleared some useless functions