Some cleanup and de-bloat.