Initial cut at import sync cleanup