Versioning changes & cleanup