Replaced UnitsFactory.makeXYZ() with direct constructor call
Adjusted copyright dates, removed unused imports