Deprecation removed build fixed