Remove version change, use instancetype as return type for custom initializer