several cleanups