Fixes in CS, documentation and removed some innecessary use statements