Deleting unused classes and adding mockito jar