Remove duplicated code
Upgrade jboss-classfilewriter to 1.0.5.Final