cleanup of put and edit