Removing unneeded imports. Moving to ResultSet.
Merge remote-tracking branch 'origin/master'