Wall: remove extra imports, rename shadowing vars