Remove more DataValues crap

Change-Id: I6596c8eb7d274d8e92accf15c34e073028cf6946