reorganization/clean up

- deleted unused variables
- moved function calls of [us.json] and [cicstructure.json] to after definition of draw() and setup() to avoid potential issues