some more clean up.
and i forgot to remove some notes from the header...