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