Consolidated some projects/assemblies, removed unused using statement