Remove some debugging code
Remove shallow-copy from dependencies
Remove now unused modules
Add server to keywords