* Adds next-unused * Cleanup * Update next-unused * Removes next-unused Co-authored-by: Peer Richelsen <peeroke@gmail.com>