If the flow of removing items is consolidated into one functions we can probably get rid of these extra variables as well.