Tidy up versions and exclusions