More removal of version dependency...