IR->SSM: cleaned up some bits