border, cleanup