Reverted back to clean + Tomcat 7 libs