Removing clear of var map of the container - it was bombing when var map was cleared in wait_for