Cleanup of changes