some cleanup, etc.