CS fix and remove unused dependencies