small cleanup in singularborders