Clear up a partial
Remove several units and variables
Version 2.7.3