Remove Strict dependency