Refactoring and stuff.
Getting rid of cl dependency.
Oops.