Quality check

- added FIXMEs
- removed unused code