DOC some docstrings, remove old class.