CS
Remove deprecated code
CS
WIP