DBChoice, problems with (/:pre) solved
unused components removed