Border clean-up