Remove upgrade code that was re-introduced during the merge
Remove debug logging