Removed oracle specific junk