Core cleanups