remove dependencies
implementing Chris suggestions
Merged refs/pull/4848/head from repository cms-sw