ID Ewais + removed unused vars