clean up redundant macros and defines

Signed-off-by: Ondrej Oprala <ooprala@redhat.com>