Added mack build and cleanup