Remove buttons that were not displayed anyway, to simplify the markup