some cleanup,