CS fix
Remove unused code
Merge pull request #863 from megazoll/patch-1

CS fix and remove unused code