Clean up on tank code