[FIX] Delete duplicate and unitil code