clean up moment shift and color corrections code