Mac_Lin cleaning up