Cleanup to be able to compile with YASSL.
Temporary push as some tests still fails.