Cleaned up: docs, obsolete code, etc.