#924 tweak remove tanktrap/camonet