Move to the built-in custom_pom addon
EOF whitespace cleanup