Removed dead code
Support uint8 etc