Cleanup from Mac_windows
Further cleanup from Mac_windows