Removing unnecessary result classes