Removed unused aliases
Added missing phpdoc