make some cleanup