Even more house cleaning