Removed unused variables.
Added default UIDs.
Removed references to raw types.
Removed unused import and variable.
Removed unused fields. Added default UIDs. Removed references to raw types.
Removed references to raw types.
Revert "Remove unused block"

This reverts commit 6fe49815d8efaac354780f32d503a4cca75f31fe.
Remove unused variable
UIDs and suppressed a handful of warnings.
Close resource