Removed unnecessary service discovery
Dropped commons-io dependency