more cleanup
ResultMessage now takes ResultSet