Cleanup and simplify TabDrawer & remove maPoly

Change-Id: Ib11a610bafcc54516b873304f778ee92603d5c31