Removed some Ryu dependant code form HPVAN