Remove cilantro directory from bad merge

Culprit is 2f36eccaa6a6931f7a938d46845358b0936fe012