0000506: Single xml solution - removed old #defines