Adding exclude option
Cleaning unused dependencies