Cleaning up. Added tomcat plugin