[FIX] Remove unneeded fields