Fixes: #2692 cleaning systems objectTypes definitions