Clean up of struts.xml + other classes