Clean and edits in client