Remove unused fields (add later back if needed)