Remove the border for old sugar build