Clean up even more that just slow down