deleted what's not needed from older master