Cleanup, goodbye 3.4