- Remove unused API on DataSource - Add some sensible javadoc to DataSource - Minor code simplification