Enhance remove methods.
Update pom.xml.