chore(CS): add array type hint where used
chore(cleanup): remove dead code