Remove comented code
Find working template import