Fix error on system/environment/storage

- Use already set `$interface` for submit button
- Remove unused helper