This should remove all but one code smell on landscape.io