Obsolete units fix

Removed references to obsolete units in various files.