BS-7456, add missing direct used dependencies, remove unused
dependencies and update server shade
BS-7456, simplify shade