Cleaned up some dependencies
Can now be run by several processes on the same server at once