Code cleanup. Naming of fields, unused assemblies and more.