Cleanup in masks serialization

Mikhail Svechnikovrequested to merge
mask_serialization_cleanup into main

Removes remnants from refactoring

Merge request reports