Did some cleanup, considerations around certificates?