Lib cleanup, use spigot now