Revert "Border stuff"

This reverts commit 8e9df95f82101bb2b9a7331faa4fff2344d264f2.
dsstore
s