some cleanup, etc