cleaning some more stuff up.