Removed unneeded kettle dependency.
Added additional variable definition per Antranig.
Remove bad copy / paste code.