rm some stale FIXMEs and comments