oooops
more ops remnants/cleanup