Remove old behaviour