assert cleanup

Based on commit# a2a962120cf1b7611a0d755b3bdfa2231b653034