Clean up prior to pulling into analytics engine