Revert "Remove use of items in function name, use list instead so its easier to read, remove unused function"

This reverts commit 3760ce86c46b6060cdb3d7606b590814dd061035.