Add support for existing WeatherAgent setups and clean up code