Oracle execute statements and some cleanup (work in progress)