grooming: drop pointless overrides, stub layer comments