Clean up core path functions