Remove more longer required 16 bit conversions