Removed more old code to be replaced by VBO.