Updated phpdoc blocks. Removed obsolete code. Taken advice of Sensiolabs Insights.