Pass parameters to script/server
Remove dead code
Remove unused helper classes