cleanup:
- remove code that was not required for testing anymore