Upgraded to Spring boot 1.0.0.RELEASE and cleaned up some code