Cleaned up some unused code and improved

weather usage etc...