Remove unneeded include
Add some notes about what more needs to be done

These mostly take the form of ASSERTs and FIXMEs.