Removing more things related to mesos