LichNet refactoring and clean-up