Eliminated unused array.  Minor code cleanup.
Merge branch 'dev' into test