Even more for real with cleanup