Don't retain non referenced PreparedStatement

JAVA-201 #fixes
Merge branch '1.0' into 2.0