Cleanup some core files