Cleanup supertank and add sanity checks
Cleanup tank and add sanity checks