Cleanup:
- Group stuff according to logic
- Remove unused junk
- rmbak: improve