Feature/mz tab cleanup