Cleanup, minor boot optimizations