more system cleanups