Remove MnSymbol-dependency, some clean-up