code changes working for Oracle
cleanup