Removed unnecessary fields.
Added TODO-s for things that need to be addressed.