fairly large clean up
dont need this
check point