Further cleanup Mac_Linux
Further addition from Mac_Linux