Did some more house cleaning