Task #120: Remove border where we don't need it