More cleanup and register Slim