Skavish/paths cleanup