Mac

initial cleanup