cleanup: everywhere