v2.0.4 - removed some comments from code - to reduce SensioInsight violations