cleaning up java 1.6 warnings