Get rid of those unused mock objects