Remove unnecessary ArrayList