initial mac solution cleanup