Bootstrapped and file cleanup.