some cleanup as i debug