Simplification and consolidation.
removed WOEID, unnecessary module