removing warning.
performance.
test fix.