some cleanup, reverted for now OracleStatement