Cleanup on interface xml