Cleanup up PUT optimization