removed some dwords