All-around cleanup