Fix for remove walls