Now the are optional, let us get rid of the ones that don't have
any content.
Signed-off-by: NJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>