Removed more unused code from HPVAN