First pass of cleaning for the strippy version.