Remove Microterm and SoftLogik

and other minor tweaks.