Reorganizing properties and fields.
Removing obsolete field.
Removing obsolete TODOs.