Some old stuff taken out