more cleanups

-jason