Some more house cleaning