Additional removal of obsolete code no longer used by serverspec v2.