Added removing of multiplication of 1.