removing old code