remove deadcode, also quick fix for weather problem