Clean up imports in the Spigot class.