major cleanup - removed MCL, unused types, reference strips