Fix issues around strings

- Fix: make sure to cleanup strings
- Fix: remove macro which causes infinite loop