Remove unnecessary mock classes