Remove unnecessary expectations