Refactoring to sever connections to SLIF