Tank related cleanup