Removed references to unused classes.
Removed unused references, improved logic to bind to service.