Merge "code clean up - to remove dup code."