Remove weather references, code cleanup