Core cleanup