cleanup and add plain box