Revert "LN: Some fixes & cleanup"

This reverts commit 5c5c11617eeb7ac63f488ae045ec918bd1ab84e5.