Config.xml shenanigans/meddling/cleanup