More code cleanup
Add the notion of trusted systems