Remove dead code
Don't handle input as collection objects
Remove one level of dict in input cstruct