Useless functions removed