Removed dead code and renamed $bid due to its ambiguity

Replaced $bid var names since it can either mean betrieb/store or bezirk/region which I hope confuses you as much as it does confuse me

Please take a look at each commit separately while reviewing this.

Renamed them with the rename refactoring tool provided by my IDE so it should be safe.
Looks like all of these are no risky changes.