Follow #4. Remove useless functions