Clean up - embedded Oracle related code