cleanup
Fix CS
remove deprecated functionality