Update on Core cleanup