S3 sink more configrable
remove unused classes
add dbmap dependency