Fix bug in 4x4 band definition.

Also some unused data structures/references removed.

Change-Id: I295809e887173543e794250cb60ddaf1475ffd24
3 files changed