cleaning up non version handling