Check in latest code clean up to remove Java Warnings