Removed dependancy on external lib for Calais.