more eclipse warning cleanup