Knocked off 5% boot time.
Cleanup.