Add native tomcat library and cleanup