How about replacing landfill with pontoons (floating platforms) on which you can walk and build? Then it could make sense to be able to remove them, without being able to create water walls anywhere. They could perhaps be on the same layer as the stone/concrete floor is on land, but these can be on ...