Cleanup and extra block