Cleanup, removed unused fields.