Removed arrays, removed unnecessary code