all around cleanup