Removed extra dependency on spigot