Code cleanup / update ops table