More cleanup in liblight