LPS-34617 Need to clean up all PreparedStatements