Added PHPDoc
Removed obsolte methods