Clean-up:
- avoid warnings
- remove copy of test class that never had any OT specifics
52 files changed