Summary: Removes unnecessary imports and adds missing Override annotations
Reviewed-by: xuelei
Contributed-by: NFlorian Weimer <fweimer@redhat.com>