Remove unneccessary fields