Continuing to gut the code.