cleanup and offer modify