Removing problematic context.xml