Cleanup architecture