Removed cl dependencies