core: Clean up XXXes