FL-1329: remove masks