vpBase cleanup WIP.