Remove unnecessary zeroing code