removing unused CDI qualifiers and their usage