Cleanup and faster boot fixes.
Resolve conflict