Removing more things related to mesos
Removing now unused variables