Remove cruft
Fix formating of scaled derived units