Walls don't leak now, but we need some cleaning up