Some more border cleanup