switch to tinyhw, some cleanups

Change-Id: Ifd573d4dd11c5c463a7a8d127eff4f995f9d1833