remove dependency on commons collections