Skip a couple and import cleanup