Next fixes

* Cleanup code
* Deleted not used code
* Modified PHPDoc

See diff & comments