Real fix for remove walls and a fix for types