Improving clean-up of JDBC entities