more cleanups
Remove Integer.compare() Java7 only...