Uneeded code deleted and behavior change