Wall: remove extra imports