Mass Import cleanup