Wall: remove imports, rename opts'