Continue removing old code