removed unnecessary ArrayLists