cleanup and post edit