Cleanup and adding aponcol for reference to DB connection