removed bunch of hwdb dependent methods