common: Remove the code won't be executed

Fixes #942
Closes #944
Reviewed-by: Stef Walter <stefw@redhat.com>