- Remove unused bundles
- Fix bug with h2 on Tomcat 6 & 7