Some cleanup on tank colours