RioVArmor.java removals and stuff