Cleaning up borders