Full cleanup of Rollup Q Parser