Remove deplicate functions