Some house cleaning