some cleanup: