removed remaining warnings (not using Collections class anymore)