remove some 'cl dependnecies, etc. fix.