#3 Source clean up. There is no return to java 7.