Cleaned up PHPDocs and removed obsolete code.