remove deprecated stuff