Use uint32_t; Remove unused code