Fixes #5467

Basically cleaned up what I found, removed what should've been removed and fixed the maintenance atmos reservoirs and other stuff.

Fixes #5467