Removed findWithDefault and deprecation flag.