Removed unnecessary arrays