Removing a little bit of databattery specific addressing.