Removed dependencies between server and plugin states