Eliminated some redundant assertions