Switch to Java EE 7, Cleaning.