This removes one trap for a programmer, few unused macros, and one
unused struct.
Signed-off-by: NPavel Machek <pavel@suse.cz>
Signed-off-by: NJiri Benc <jbenc@suse.cz>