Move choice additional and removal functionality to respective dedicated functions