More clean up
More simple clean ups
...