Remove node_modules, remove CS dependency, freshen up code