Cleanup of Projection Rebuilder