clean things up, including logic