More SLIM cleanup