Complete jmock removal