[Core] Clean up a bit