Remove unused dependencies.
Use cls instead of explicit class name
Add queue name to data source
Use data source's queue name.