I don't think they will remove them, but take comfort in the fact that from HW onwards, these walls are far less prevalent due to flying.