Cosmetic: remove unused variables, units