Mac_mac cleanup