Clean up docstrings, remove old code