Remove presets, small import cleanup