severa cleanups