[mr3235] RFC SQL cleanup