Removing MATSimClock
Local knowledge added