added a few more cleanups.