Remove FIXMEs and add license
Cleanup trait callees