refs #4053 cleanup code of marketplace integration