Small cleanups & robustness improvements, also remove mentions of dm2
support which was never implemented