Remove cruft, hardens version spec in prefstore