Slightly changed docstrings, removed unused function