Some arrays dont require more than 16bits
Remove some dead code