Fixed gas leak on supply line. Removed 2 street 90s from water heater gas line. Ensured furnace and water heater were both running before leaving. Current water heater 16-17 years old, in poor condition. Rust developing at seams, only a matter of time before it lets go. Strongly recommend replacing water heater in the near future.