- [CLEANUP] some cleanup
- [FIX] some leftovers were still lying around in clients..