SensioLabsInsight recommandation: Remove @TODO, @see corresponding issues