ICC-8 - Cleanup for Ubuntu
ICC-8 - Cleanup for Ubuntu