MOTM-959: cleaner commit