Minor changes to docstrings, removed a few unnecessary methods from mock.py