Some house cleaning.