MARMOTTA-66: minor cleanup