fix assert ids
remove stray includes and misc cleanup